Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Sun, 9 Jun 2013 08:58:09 +0000 (16:58 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Sun, 9 Jun 2013 08:58:09 +0000 (16:58 +0800)
commitf56a07f0c965a536bfd20dd3bfa043cc31a4ac0d
treeb0d5bf07b39a0c17123e8492364b211422cb39c2
parentbcdb5877657227b03d965aef9c5d2dc1b4e3eee2
parentaaa76254d14796e9b76df2c753701d0e3323f19f
Merge from mainline.